From 9e9979f06b0401cab2e6818c9f1b9443a0f22227 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 7 Jan 2012 12:00:56 -0800
Subject: [PATCH] Fix ChangeLog typo.

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dac7953b60a..828fc68d541 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -133,7 +133,6 @@
 
 	* mail/rmail.el (rmail-show-message-1): Decode any RFC2047 encoded
 	headers of non-MIME messages, when rmail-enable-mime is non-nil.
->>>>>>> MERGE-SOURCE
 
 2011-12-29  Michael Albinus  <michael.albinus@gmx.de>
 
-- 
2.30.2